From 42387a82463d5dba0938b56015ac6634d560a2f7 Mon Sep 17 00:00:00 2001 From: Kevin Cozens Date: Wed, 12 Sep 2007 00:44:02 +0000 Subject: [PATCH] Added check for existence of automake-1.10. Fixes bug #474507. 2007-09-11 Kevin Cozens * autogen.sh: Added check for existence of automake-1.10. Fixes bug #474507. svn path=/trunk/; revision=239 --- ChangeLog | 5 +++++ autogen.sh | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index b86c9f9..52041dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-09-11 Kevin Cozens + + * autogen.sh: Added check for existence of automake-1.10. + Fixes bug #474507. + 2007-09-10 Øyvind Kolås * babl/babl-internal.c: (babl_process): return immediately if 0 pixels diff --git a/autogen.sh b/autogen.sh index fcb32da..3765eaf 100755 --- a/autogen.sh +++ b/autogen.sh @@ -129,6 +129,9 @@ echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... " if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then AUTOMAKE=$AUTOMAKE ACLOCAL=$ACLOCAL +elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake-1.10 + ACLOCAL=aclocal-1.10 elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then AUTOMAKE=automake-1.9 ACLOCAL=aclocal-1.9 -- 2.30.2